From f74c139d26efadfa929bcaca1aea5985fa819711 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Tue, 15 May 2018 20:53:46 -0600 Subject: [PATCH] have travis avoid ppa environment script. --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a9029ab6..28f6819a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,9 @@ matrix: sources: packages: -before_install: - - if [ "${USE_DOCKER}" = "false" ]; then source "/opt/qt${QT_VERSION}/bin/qt${QT_VERSION}-env.sh"; fi +#before_install: +# skip Stephan Binner's environment script. we will pass the bits we need along to our build. +# - if [ "${USE_DOCKER}" = "false" ]; then source "/opt/qt${QT_VERSION}/bin/qt${QT_VERSION}-env.sh"; fi install: - if [ "${USE_DOCKER}" = "false" ]; then wget 'https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage'; fi @@ -55,7 +56,8 @@ install: script: - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi - - if [ "${USE_DOCKER}" = "false" ]; then LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi - - unset QTDIR; unset LD_LIBRARY_PATH; unset PKG_CONFIG_PATH; # partially undo qt${QT_VERSION}-env.sh for linuxdeployqt based on https://github.com/probonopd/linuxdeployqt + - if [ "${USE_DOCKER}" = "false" ]; then QMAKE=/opt/qt${QT_VERSION}/bin/qmake LUPDATE=/opt/qt${QT_VERSION}/bin/lupdate LRELEASE=/opt/qt${QT_VERSION}/bin/lrelease LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi +# partially undo qt${QT_VERSION}-env.sh for linuxdeployqt based on https://github.com/probonopd/linuxd +# - unset QTDIR; unset LD_LIBRARY_PATH; unset PKG_CONFIG_PATH; - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file - if [ "${USE_DOCKER}" = "false" ]; then cd gui; QMAKE=/opt/qt${QT_VERSION}/bin/qmake LINUXDEPLOYQT=../linuxdeployqt ./makeappimage.sh; fi -- 2.30.2